3bf67b
@@ -18,7 +18,6 @@
 
 package org.apache.hadoop.hive.ql.io;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -317,8 +316,8 @@
private static PartitionDesc doGetPartitionDescFromPath(
 
     if (part == null) {
       String dirStr = dir.toString();
-      int dirPathIndex = dirPath.lastIndexOf(File.separator);
-      int dirStrIndex = dirStr.lastIndexOf(File.separator);
+      int dirPathIndex = dirPath.lastIndexOf(Path.SEPARATOR);
+      int dirStrIndex = dirStr.lastIndexOf(Path.SEPARATOR);
       while (dirPathIndex >= 0 && dirStrIndex >= 0) {
         dirStr = dirStr.substring(0, dirStrIndex);
         dirPath = dirPath.substring(0, dirPathIndex);
@@ -331,8 +330,8 @@
private static PartitionDesc doGetPartitionDescFromPath(
         if (part != null) {
           break;
         }
-        dirPathIndex = dirPath.lastIndexOf(File.separator);
-        dirStrIndex = dirStr.lastIndexOf(File.separator);
+        dirPathIndex = dirPath.lastIndexOf(Path.SEPARATOR);
+        dirStrIndex = dirStr.lastIndexOf(Path.SEPARATOR);
       }
     }
     return part;
@@ -362,8 +361,8 @@
private static String getMatchingPath(Map<String, ArrayList<String>> pathToAlias
     path = dirPath;
 
     String dirStr = dir.toString();
-    int dirPathIndex = dirPath.lastIndexOf(File.separator);
-    int dirStrIndex = dirStr.lastIndexOf(File.separator);
+    int dirPathIndex = dirPath.lastIndexOf(Path.SEPARATOR);
+    int dirStrIndex = dirStr.lastIndexOf(Path.SEPARATOR);
     while (dirPathIndex >= 0 && dirStrIndex >= 0) {
       dirStr = dirStr.substring(0, dirStrIndex);
       dirPath = dirPath.substring(0, dirPathIndex);
@@ -374,8 +373,8 @@
private static String getMatchingPath(Map<String, ArrayList<String>> pathToAlias
       if (foundAlias(pathToAliases, dirPath)) {
         return dirPath;
       }
-      dirPathIndex = dirPath.lastIndexOf(File.separator);
-      dirStrIndex = dirStr.lastIndexOf(File.separator);
+      dirPathIndex = dirPath.lastIndexOf(Path.SEPARATOR);
+      dirStrIndex = dirStr.lastIndexOf(Path.SEPARATOR);
     }
     return null;
   }
